git cherry pick merge commit